Return to Agent Events after Event show (#1555)
Enfop
2 changed files with 2 additions and 2 deletions
+ 1
- 1
app/views/events/index.html.erb
@@ -32,7 +32,7 @@ |
||
| 32 | 32 |
<td class='payload'><%= truncate event.payload.to_json, :length => 90, :omission => "" %></td> |
| 33 | 33 |
<td> |
| 34 | 34 |
<div class="btn-group btn-group-xs"> |
| 35 |
- <%= link_to 'Show', event_path(event), class: "btn btn-default" %> |
|
| 35 |
+ <%= link_to 'Show', event_path(event, return: request.fullpath), class: "btn btn-default" %> |
|
| 36 | 36 |
<%= link_to 'Re-emit', reemit_event_path(event), method: :post, data: { confirm: 'Are you sure you want to duplicate this event and emit the new one now?' }, class: "btn btn-default" %>
|
| 37 | 37 |
<%= link_to 'Delete', event_path(event), method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-default" %>
|
| 38 | 38 |
</div> |
+ 1
- 1
app/views/events/show.html.erb
@@ -49,7 +49,7 @@ |
||
| 49 | 49 |
|
| 50 | 50 |
<br /> |
| 51 | 51 |
<div class="btn-group"> |
| 52 |
- <%= link_to icon_tag('glyphicon-chevron-left') + ' Back'.html_safe, events_path, class: "btn btn-default" %>
|
|
| 52 |
+ <%= link_to icon_tag('glyphicon-chevron-left') + ' Back'.html_safe, filtered_agent_return_link || events_path, class: "btn btn-default" %>
|
|
| 53 | 53 |
</div> |
| 54 | 54 |
</div> |
| 55 | 55 |
</div> |